Skip to content

Conversation

@encukou
Copy link
Member

@encukou encukou commented Feb 9, 2026

(cherry picked from commit 51d3099)

@encukou encukou requested a review from sethmlarson as a code owner February 9, 2026 13:27
@encukou encukou changed the title [3.13] gh-131261: expat/refresh.sh: Expand list of manual steps (GH-131359) [3.13] gh-131261: generate_sbom.py: Exclude the refresh script from SBOM (GH-131359) Feb 9, 2026
@encukou
Copy link
Member Author

encukou commented Feb 9, 2026

This causes a conflict when backporting the expat update. In #144500, I currently bundle this fix with the expat update, but it seems cleaner to have it as a separate commit.

@sethmlarson, does that sound good?

Copy link
Contributor

@sethmlarson sethmlarson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

- Verify all is okay:
git diff
git status
- Regenerate the sbom file
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that I look at it, this is missing a step, you have to update the version in the sbom file IIRC.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you send a PR for main?
I don't think it even needs to be backported since you only do that on main.

@encukou encukou merged commit bad4bc4 into python:3.13 Feb 10, 2026
53 checks passed
@encukou encukou deleted the backport-51d3099-3.13 branch February 10, 2026 09:49
@encukou encukou added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Feb 10, 2026
@miss-islington-app
Copy link

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @encukou, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker bad4bc4603fea4541b9e3db45b4050104e461c0a 3.10

@miss-islington-app
Copy link

Sorry, @encukou, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker bad4bc4603fea4541b9e3db45b4050104e461c0a 3.11

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 10, 2026
…from SBOM (pythonGH-131359) (pythonGH-144625)

- generate_sbom.py: Exclude the refresh script from SBOM
- Modules/expat/refresh.sh: Expand the list of manual steps
(cherry picked from commit bad4bc4)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
(cherry picked from commit 51d3099)
@bedevere-app
Copy link

bedevere-app bot commented Feb 10, 2026

GH-144660 is a backport of this pull request to the 3.12 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants